[HVM] Remove unused apic_enabled field from hvm_info_table.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/firmware/hvmloader/hvmloader.c b/tools/firmware/hvmloader/hvmloader.c
index ec38f5737ea27d5063d2970f5c00f6bbf1c45322..7d95cf8f823d6ce96b10724cbf2fb5988f204d25 100644 (file)
--- a/tools/firmware/hvmloader/hvmloader.c
+++ b/tools/firmware/hvmloader/hvmloader.c
@@ -26,7 +26,7 @@
 #include "hypercall.h"
 #include "util.h"
 #include <xen/version.h>
-#include <xen/hvm/hvm_info_table.h>
+#include <xen/hvm/params.h>
 
 /* memory map */
 #define HYPERCALL_PHYSICAL_ADDRESS     0x00080000
@@ -172,7 +172,7 @@ init_hypercalls(void)
 int
 main(void)
 {
-       struct hvm_info_table *t = get_hvm_info_table();
+       struct xen_hvm_param hvm_param;
 
        puts("HVM Loader\n");
 
@@ -180,7 +180,10 @@ main(void)
 
        puts("Loading ROMBIOS ...\n");
        memcpy((void *)ROMBIOS_PHYSICAL_ADDRESS, rombios, sizeof(rombios));
-       if (t->apic_enabled)
+
+       hvm_param.domid = DOMID_SELF;
+       hvm_param.index = HVM_PARAM_APIC_ENABLED;
+       if (!hypercall_hvm_op(HVMOP_get_param, &hvm_param) && hvm_param.value)
                create_mp_tables();
        
        if (cirrus_check()) {

diff --git a/tools/libxc/xc_hvm_build.c b/tools/libxc/xc_hvm_build.c
index 546668f33d4f407168bc03fd0d234f886fe433d1..d374631913d7e0faa8e9a6a6eb665f9a0dbe8974 100644 (file)
--- a/tools/libxc/xc_hvm_build.c
+++ b/tools/libxc/xc_hvm_build.c
@@ -185,7 +185,6 @@ static int set_hvm_info(int xc_handle, uint32_t dom,
     strncpy(va_hvm->signature, "HVM INFO", 8);
     va_hvm->length       = sizeof(struct hvm_info_table);
     va_hvm->acpi_enabled = acpi;
-    va_hvm->apic_enabled = apic;
     va_hvm->nr_vcpus     = vcpus;
 
     set_hvm_info_checksum(va_hvm);

diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index 62b328de54d6f18dbc24c9e3e1b09c8cf001270b..2b1f7c887a021b98b895ff3fb45aec94a2bcd227 100644 (file)
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -47,7 +47,6 @@
 #endif
 #include <public/sched.h>
 #include <public/hvm/ioreq.h>
-#include <public/hvm/hvm_info_table.h>
 #include <public/version.h>
 #include <public/memory.h>
 

diff --git a/xen/include/public/hvm/hvm_info_table.h b/xen/include/public/hvm/hvm_info_table.h
index 69e5dcf19a61cb59138d625d04b34ffc37e0bae3..3b705eeedfcb441259eb79db5c382b39e3113720 100644 (file)
--- a/xen/include/public/hvm/hvm_info_table.h
+++ b/xen/include/public/hvm/hvm_info_table.h
@@ -16,7 +16,6 @@ struct hvm_info_table {
     uint32_t    length;
     uint8_t     checksum;
     uint8_t     acpi_enabled;
-    uint8_t     apic_enabled;
     uint32_t    nr_vcpus;
 };